Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UI/#53] TerningBasicDialog #61

Merged
merged 13 commits into from
Jul 12, 2024
Merged

[UI/#53] TerningBasicDialog #61

merged 13 commits into from
Jul 12, 2024

Conversation

arinming
Copy link
Contributor

⛳️ Work Description

  • TerningBasicDialog 구현 및 띄우기
  • ScrapDialogContent 구현
  • 색상 버튼 toggle 구현

📸 Screenshot

53.mp4

📢 To Reviewers

  • 석준오빠 컬러 팔레트 머지되면 풀 받고 합친 다음 머지하겠습니당~~~~

@arinming arinming added UI 💐 UI 작업 아린💛 아린 labels Jul 12, 2024
@arinming arinming added this to the 1차 스프린트 UI 작업 milestone Jul 12, 2024
@arinming arinming self-assigned this Jul 12, 2024
@arinming arinming linked an issue Jul 12, 2024 that may be closed by this pull request
3 tasks
Copy link
Member

@Hyobeen-Park Hyobeen-Park left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

다이얼로그 만들어주는 형님 최고최고!! 야무지게 써보겠어요😎 감사합니다!!

Row(
modifier = Modifier
.width(60.dp)
.height(60.dp)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aspectRatio 사용해도 좋을 것 같아요!

modifier = Modifier.padding(bottom = 29.dp),
verticalArrangement = Arrangement.spacedBy(
5.dp,
Alignment.CenterVertically
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

와우 Arrangement 안에 Alignment 넣을 수 있는거 처음 알았어요..!!

Comment on lines 194 to 196
stringResource(id = R.string.intern_info_d_day) to "2024년 7월 23일",
stringResource(id = R.string.intern_info_working) to "2개월",
stringResource(id = R.string.intern_info_start_date) to "2024년 8월"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

파라미터로 받아오는걸로 수정해야 할 것 같아요!!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아니 진짜 섬세,, ㅠㅠ 고쳤릅니다!

} else {
R.string.dialog_scrap_button
},
onButtonClick = { /*TODO*/ },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이렇게 하면 ripple이 생겨서 noRippleClickable 사용하는게 좋을 것 같아요!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

흠,,근데 제가 noRippleTheme 작성했었는데 적용이 안 되나요,,?
onButtonClick에 아무 로직이 없어서 그런 것 같기도 한데 한번 해보고 ripple 없는 지 확인해주세요!!!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요거는 유빈이가 만들어준거라서 디폴트로 적용되어 이씁니다!

Comment on lines 86 to 99

when {
openDialog.value -> {
TerningBasicDialog(
onDismissRequest = { openDialog.value = false },
content = {
ScrapDialogContent(
onDismissRequest = { openDialog.value = false },
isScrapped = false
)
}
)
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이거 머지하기 전에 꼭 수정하고 머지해주세요!!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

수정 해씀다!

Copy link
Member

@leeeyubin leeeyubin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아린언니 최~~고!!!

Comment on lines +57 to +59
.background(
color = White,
shape = RoundedCornerShape(20.dp)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요거 자동으로 White 설정은 안 되는 건가용,,?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넹 머터리얼 기본 보라색,,.?희미한 그 색이 되더라구욧..

Comment on lines 65 to 68
) {
IconButton(onClick = { onDismissRequest() }, modifier = Modifier.padding(6.dp)) {
Icon(
painter = painterResource(id = R.drawable.ic_dialog_x_32),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

줄바꿈!! 해주세요!! 그리구 여기가 X 버튼인 것 같은데 noRippleClickable로 해줘야 할 것 같아요!!

컴포즈는 기본으로 ripple 효과가 들어가기 때문에 요 부분 신경써준다면 감사하겠습니당

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵 적용해씁니다!!!

Comment on lines 175 to 177
)
if (isColorChange) {
Text(text = "컬러 팔레트")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

추출해주세요!!!

} else {
R.string.dialog_scrap_button
},
onButtonClick = { /*TODO*/ },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

흠,,근데 제가 noRippleTheme 작성했었는데 적용이 안 되나요,,?
onButtonClick에 아무 로직이 없어서 그런 것 같기도 한데 한번 해보고 ripple 없는 지 확인해주세요!!!

Comment on lines 78 to 80
) {
Box(modifier = modifier.size(39.dp)) {
Box(modifier = modifier.wrapContentSize()) {
Box(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

굿!!!!!!!!!!!!!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

굿2!!!!!!

Copy link
Member

@Hyobeen-Park Hyobeen-Park left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아리니 최~~~고~~

Copy link
Member

@boiledEgg-s boiledEgg-s left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

너무 고생하셨어요~~~ 바로 재사용하러 갑니닷!!!

Comment on lines 78 to 80
) {
Box(modifier = modifier.size(39.dp)) {
Box(modifier = modifier.wrapContentSize()) {
Box(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

굿2!!!!!!

@arinming arinming merged commit 655cc53 into develop Jul 12, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
UI 💐 UI 작업 아린💛 아린
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[UI] TerningBasicDialog
4 participants